Revert our changes and use FireMasterK's improvements by Stypox · Pull Request #27 · TeamNewPipe/nanojson

Stypox · 2025-10-03T10:29:42Z

This PR does these things:

it reverts all of our commits related to parsing custom JSON format. You can see all of our commits from here:
- | 72c8ed4 Revert "Support JS-like JSON"
- | 41f29d8 Revert "Support keys starting with a non-ASCII character"
- | d3b1b70 Revert "Support single quote strings"
- | f9d8d68 Revert "Support keywords as keys"
- | e2cd3f0 Revert "Fix some more semi-string parsing bugs"
- | 714bb89 Revert "Disallow semi-strings as value"
- | b52e21a Revert "Fix Checkstyle errors"
- | 9718d33 Revert "Fix issue for semi-strings as well"
the only two commits that were not reverted are 0e64c2b d5da581, which are both also present in FireMasterK's fork
additionally, the README changes were retained (5494f3c) and updated with fcb2efd
pulls in updates from upstream
pulls in @FireMasterK's performance changes (note that this required reverting the other commits, since @FireMasterK's fork has just removed those commits directly, but I would prefer not to force-push on our master branch).
I skipped commit c624b79 since it pulls in the fastutil library to squeeze out the last bits of performance, but we'd prefer not to increase APK size, as suggested by @FireMasterK in Use Piped's fork of nanojson NewPipeExtractor#981 (comment), also see TeamNewPipe/NewPipeExtractor@325c07d (#981)
I did include commit 24eb336 though, even though it adds the fastdoubleparser library. I don't think it matters much whether we keep it or not, the JAR is just 191kB but I'm pretty sure most of it would be optimized out or merged during build. Let me know if I should revert this.
I also skipped commit a507525 and instead made sure we retain compatibility with JDK 11 with 2a27a17.
fixes checkstyle

All tests pass. This PR is basically a replacement for TeamNewPipe/NewPipeExtractor#981, where many people suggested updating our own fork. While I initially was against, I now think it's necessary if we want to have some of @FireMasterK's commits but not all.

Closes #2

Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.0 to 3.3.2. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.3.0...maven-javadoc-plugin-3.3.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.9.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](apache/maven-site-plugin@maven-site-plugin-3.9.1...maven-site-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-site-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps nexus-staging-maven-plugin from 1.6.8 to 1.6.12. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.8.1 to 3.10.1. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](apache/maven-compiler-plugin@maven-compiler-plugin-3.8.1...maven-compiler-plugin-3.10.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…che.maven.plugins-maven-compiler-plugin-3.10.1 Bump maven-compiler-plugin from 3.8.1 to 3.10.1

…che.maven.plugins-maven-javadoc-plugin-3.3.2 Bump maven-javadoc-plugin from 3.3.0 to 3.3.2

…che.maven.plugins-maven-site-plugin-3.11.0 Bump maven-site-plugin from 3.9.1 to 3.11.0

…atype.plugins-nexus-staging-maven-plugin-1.6.12 Bump nexus-staging-maven-plugin from 1.6.8 to 1.6.12

Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.3.2 to 3.4.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.3.2...maven-javadoc-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.11.0 to 3.12.0. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](apache/maven-site-plugin@maven-site-plugin-3.11.0...maven-site-plugin-3.12.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-site-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps nexus-staging-maven-plugin from 1.6.12 to 1.6.13. --- updated-dependencies: - dependency-name: org.sonatype.plugins:nexus-staging-maven-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [exec-maven-plugin](https://github.com/mojohaus/exec-maven-plugin) from 3.0.0 to 3.1.0. - [Release notes](https://github.com/mojohaus/exec-maven-plugin/releases) - [Commits](mojohaus/exec-maven-plugin@exec-maven-plugin-3.0.0...exec-maven-plugin-3.1.0) --- updated-dependencies: - dependency-name: org.codehaus.mojo:exec-maven-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…ehaus.mojo-exec-maven-plugin-3.1.0 Bump exec-maven-plugin from 3.0.0 to 3.1.0

…atype.plugins-nexus-staging-maven-plugin-1.6.13 Bump nexus-staging-maven-plugin from 1.6.12 to 1.6.13

…che.maven.plugins-maven-javadoc-plugin-3.4.0 Bump maven-javadoc-plugin from 3.3.2 to 3.4.0

…che.maven.plugins-maven-site-plugin-3.12.0 Bump maven-site-plugin from 3.11.0 to 3.12.0

Bumps [maven-site-plugin](https://github.com/apache/maven-site-plugin) from 3.12.0 to 3.12.1. - [Release notes](https://github.com/apache/maven-site-plugin/releases) - [Commits](apache/maven-site-plugin@maven-site-plugin-3.12.0...maven-site-plugin-3.12.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-site-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Implements toString on JsonLazyNumber.

…che.maven.plugins-maven-site-plugin-3.12.1 Bump maven-site-plugin from 3.12.0 to 3.12.1

Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.0 to 3.4.1. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.4.0...maven-javadoc-plugin-3.4.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [maven-checkstyle-plugin](https://github.com/apache/maven-checkstyle-plugin) from 3.1.2 to 3.2.1. - [Release notes](https://github.com/apache/maven-checkstyle-plugin/releases) - [Commits](apache/maven-checkstyle-plugin@maven-checkstyle-plugin-3.1.2...maven-checkstyle-plugin-3.2.1) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-checkstyle-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

…che.maven.plugins-maven-checkstyle-plugin-3.2.1 Bump maven-checkstyle-plugin from 3.1.2 to 3.2.1

…che.maven.plugins-maven-javadoc-plugin-3.4.1 Bump maven-javadoc-plugin from 3.4.0 to 3.4.1

Bumps [maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.4.1 to 3.5.0. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.4.1...maven-javadoc-plugin-3.5.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [maven-surefire-report-plugin](https://github.com/apache/maven-surefire) from 2.22.2 to 3.0.0. - [Release notes](https://github.com/apache/maven-surefire/releases) - [Commits](apache/maven-surefire@surefire-2.22.2...surefire-3.0.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-surefire-report-plugin dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>

…che.maven.plugins-maven-surefire-report-plugin-3.0.0 Bump maven-surefire-report-plugin from 2.22.2 to 3.0.0

…che.maven.plugins-maven-javadoc-plugin-3.5.0 Bump maven-javadoc-plugin from 3.4.1 to 3.5.0

…1.3 (mmastrac#146) Bumps [org.apache.maven.plugins:maven-javadoc-plugin](https://github.com/apache/maven-javadoc-plugin) from 3.11.2 to 3.11.3. - [Release notes](https://github.com/apache/maven-javadoc-plugin/releases) - [Commits](apache/maven-javadoc-plugin@maven-javadoc-plugin-3.11.2...maven-javadoc-plugin-3.11.3) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-javadoc-plugin dependency-version: 3.11.3 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

) Bumps [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit-framework) from 5.13.3 to 5.13.4. - [Release notes](https://github.com/junit-team/junit-framework/releases) - [Commits](junit-team/junit-framework@r5.13.3...r5.13.4) --- updated-dependencies: - dependency-name: org.junit.jupiter:junit-jupiter dependency-version: 5.13.4 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

This reverts commit f2bd866.

This reverts commit b2c9c6f.

This reverts commit e68b36a.

This reverts commit b2f4abd.

This reverts commit 93da2aa.

This reverts commit 3324e15.

This reverts commit 216af63.

This reverts commit 0363134.

…s-and-use-firemasterk-2

FireMasterK · 2025-10-03T10:35:00Z

Nice, however in NewPipeExtractor you will need to add support for LazyStrings, like this: FireMasterK/NewPipeExtractor@165b459

TobiGr · 2025-10-03T11:11:30Z

What is the correct review process for this PR?
I think that the changes which are explained in the description sound reasonable. Reviewing the code line by line isn't necessary in my opinion because it has already been reviewed and is running in Piped. I think this is good to go if the tests in /src/test pass.

I did include commit 24eb336 though, even though it adds the fastdoubleparser library. I don't think it matters much whether we keep it or not, the JAR is just 191kB but I'm pretty sure most of it would be optimized out or merged during build. Let me know if I should revert this.

Including this is ok for me. If you want, feel free to compile two JARs and compare their sizes. I'd also assume that most of the lib is going to be optimized away.

Stypox · 2025-10-03T12:27:41Z

@TobiGr the difference seems to be just 664 bytes which is totally fine in my opinion:

34626  nanojson-1.11-SNAPSHOT_with_fastdoubleparser.jar
33962  nanojson-1.11-SNAPSHOT_without_fastdoubleparser.jar

TobiGr

Tests pass locally and the commits were chosen reasonably.

Stypox · 2025-10-03T14:45:49Z

I removed the commit that updates to Java 17, and pushed another commit for the pom.xml that makes sure that, independently of the JDK used during build, the resulting JAR is compatible with Java 11. There was only one small thing in the whole codebase that was incompatible with Java 11, so I fixed that.

dependabot bot and others added 30 commits February 11, 2022 23:11

Merge pull request mmastrac#67 from mmastrac/dependabot/maven/org.apa…

e76892e

…che.maven.plugins-maven-compiler-plugin-3.10.1 Bump maven-compiler-plugin from 3.8.1 to 3.10.1

Merge pull request mmastrac#61 from mmastrac/dependabot/maven/org.apa…

c2fead4

…che.maven.plugins-maven-javadoc-plugin-3.3.2 Bump maven-javadoc-plugin from 3.3.0 to 3.3.2

Merge pull request mmastrac#65 from mmastrac/dependabot/maven/org.apa…

fed7737

…che.maven.plugins-maven-site-plugin-3.11.0 Bump maven-site-plugin from 3.9.1 to 3.11.0

Merge pull request mmastrac#66 from mmastrac/dependabot/maven/org.son…

2f9d44b

…atype.plugins-nexus-staging-maven-plugin-1.6.12 Bump nexus-staging-maven-plugin from 1.6.8 to 1.6.12

Merge pull request mmastrac#72 from mmastrac/dependabot/maven/org.cod…

970e874

…ehaus.mojo-exec-maven-plugin-3.1.0 Bump exec-maven-plugin from 3.0.0 to 3.1.0

Merge pull request mmastrac#71 from mmastrac/dependabot/maven/org.son…

2b58935

…atype.plugins-nexus-staging-maven-plugin-1.6.13 Bump nexus-staging-maven-plugin from 1.6.12 to 1.6.13

Merge pull request mmastrac#69 from mmastrac/dependabot/maven/org.apa…

58dc40c

…che.maven.plugins-maven-javadoc-plugin-3.4.0 Bump maven-javadoc-plugin from 3.3.2 to 3.4.0

Merge pull request mmastrac#70 from mmastrac/dependabot/maven/org.apa…

132ada2

…che.maven.plugins-maven-site-plugin-3.12.0 Bump maven-site-plugin from 3.11.0 to 3.12.0

Implements toString on JsonLazyNumber.

6b8c1ef

Merge pull request mmastrac#74 from adriantodt/issue/nanojson-68

50459f2

Implements toString on JsonLazyNumber.

Merge pull request mmastrac#73 from mmastrac/dependabot/maven/org.apa…

d96f57e

…che.maven.plugins-maven-site-plugin-3.12.1 Bump maven-site-plugin from 3.12.0 to 3.12.1

Merge pull request mmastrac#78 from mmastrac/dependabot/maven/org.apa…

3c62a14

…che.maven.plugins-maven-checkstyle-plugin-3.2.1 Bump maven-checkstyle-plugin from 3.1.2 to 3.2.1

Merge pull request mmastrac#75 from mmastrac/dependabot/maven/org.apa…

3a9c8b5

…che.maven.plugins-maven-javadoc-plugin-3.4.1 Bump maven-javadoc-plugin from 3.4.0 to 3.4.1

Merge pull request mmastrac#81 from mmastrac/dependabot/maven/org.apa…

03ff2a8

…che.maven.plugins-maven-surefire-report-plugin-3.0.0 Bump maven-surefire-report-plugin from 2.22.2 to 3.0.0

Merge pull request mmastrac#79 from mmastrac/dependabot/maven/org.apa…

5b9a587

…che.maven.plugins-maven-javadoc-plugin-3.5.0 Bump maven-javadoc-plugin from 3.4.1 to 3.5.0

Delete codeql-analysis.yml

5b53963

Create .github/workflows/maven.yml

c0c6958

dependabot bot and others added 16 commits August 26, 2025 11:05

Revert "Fix issue for semi-strings as well"

9718d33

This reverts commit f2bd866.

Revert "Fix Checkstyle errors"

b52e21a

This reverts commit b2c9c6f.

Revert "Disallow semi-strings as value"

714bb89

This reverts commit e68b36a.

Revert "Fix some more semi-string parsing bugs"

e2cd3f0

This reverts commit b2f4abd.

Revert "Support keywords as keys"

f9d8d68

This reverts commit 93da2aa.

Revert "Support single quote strings"

d3b1b70

This reverts commit 3324e15.

Revert "Support keys starting with a non-ASCII character"

41f29d8

This reverts commit 216af63.

Revert "Support JS-like JSON"

72c8ed4

This reverts commit 0363134.

Update README

fcb2efd

Merge remote-tracking branch 'mmastrac/master' into revert-our-change…

d331e00

…s-and-use-firemasterk-2

Attempt to use CharBuffer and fastdoubleparser for better performance.

0883395

Attempt to lazily parse numbers by default.

dd52604

Implement lazy String parsing.

3e5bd69

Minimize initial buffer size to reduce memory usage.

68a1285

Stypox mentioned this pull request Oct 3, 2025

Use Piped's fork of nanojson TeamNewPipe/NewPipeExtractor#981

Closed

3 tasks

Stypox mentioned this pull request Oct 3, 2025

Update nanojson to include upstream and FireMasterK's optimizations TeamNewPipe/NewPipeExtractor#1382

Open

3 tasks

TobiGr approved these changes Oct 3, 2025

View reviewed changes

FireMasterK and others added 3 commits October 3, 2025 16:39

Buffer Pool, UTF Surrogate and test fixes.

df185fe

Fix checkstyle

397a11a

Maintain compatibility with Java 11

2a27a17

Stypox force-pushed the revert-our-changes-and-use-firemasterk branch from 3b2ed7e to 2a27a17 Compare October 3, 2025 14:40

Stypox merged commit c7a6c1c into master Oct 4, 2025
1 check passed

Stypox mentioned this pull request Oct 4, 2025

Incorrect token in JsonParserException #1

Open

TobiGr deleted the revert-our-changes-and-use-firemasterk branch October 4, 2025 14:28

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Revert our changes and use FireMasterK's improvements#27

Revert our changes and use FireMasterK's improvements#27
Stypox merged 124 commits intomasterfrom
revert-our-changes-and-use-firemasterk

Stypox commented Oct 3, 2025 •

edited

Loading

Uh oh!

FireMasterK commented Oct 3, 2025

Uh oh!

TobiGr commented Oct 3, 2025

Uh oh!

Stypox commented Oct 3, 2025

Uh oh!

TobiGr left a comment

Uh oh!

Stypox commented Oct 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

Stypox commented Oct 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

FireMasterK commented Oct 3, 2025

Uh oh!

TobiGr commented Oct 3, 2025

Uh oh!

Stypox commented Oct 3, 2025

Uh oh!

TobiGr left a comment

Choose a reason for hiding this comment

Uh oh!

Stypox commented Oct 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Stypox commented Oct 3, 2025 •

edited

Loading